[libc++][libunwind] Fix documentation CI job after #118159 #118555
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
libc++
Member
|
@llvm/pr-subscribers-libcxx @llvm/pr-subscribers-libunwind Author: Louis Dionne (ldionne) ChangesFull diff: https://github.com/llvm/llvm-project/pull/118555.diff 3 Files Affected:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index fe9c70cf1f5a95..0bb018b780a2a1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -148,14 +148,14 @@ jobs:
cmake -B libunwind-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RUNTIMES="libunwind" -DLLVM_ENABLE_SPHINX=ON ./runtimes
TZ=UTC ninja -C libunwind-build docs-libunwind-html
mkdir built-docs/libunwind
- cp -r libunwind-build/docs/* built-docs/libunwind
+ cp -r libunwind-build/libunwind/docs/* built-docs/libunwind
- name: Build libcxx docs
if: steps.docs-changed-subprojects.outputs.libcxx_any_changed == 'true'
run: |
cmake -B libcxx-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx;libunwind" -DLLVM_ENABLE_SPHINX=ON ./runtimes
TZ=UTC ninja -C libcxx-build docs-libcxx-html
mkdir built-docs/libcxx
- cp -r libcxx-build/docs/* built-docs/libcxx/
+ cp -r libcxx-build/libcxx/docs/* built-docs/libcxx/
- name: Build libc docs
if: steps.docs-changed-subprojects.outputs.libc_any_changed == 'true'
run: |
diff --git a/libcxx/docs/foo b/libcxx/docs/foo
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/libunwind/docs/foo b/libunwind/docs/foo
new file mode 100644
index 00000000000000..e69de29bb2d1d6
|
ldionne
force-pushed
the
review/fix-libcxx-documentation-build
branch
from
73e5664 to
b3b1cb2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.